x86: Suppress scary console message from sh_remove_shadows()

except in cases where the guest's behaviour is unrecoverable.

Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>

diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c
index 1816fe397be03c5516b77d43bc35338781852d0f..d7239cde77f9cbeaeebc1ab348faf14f40f4f02f 100644 (file)
--- a/xen/arch/x86/mm/shadow/common.c
+++ b/xen/arch/x86/mm/shadow/common.c
@@ -2172,13 +2172,12 @@ void sh_remove_shadows(struct vcpu *v, mfn_t gmfn, int fast, int all)
 #undef DO_UNSHADOW
 
     /* If that didn't catch the shadows, something is wrong */
-    if ( !fast && (pg->count_info & PGC_page_table) )
+    if ( !fast && all && (pg->count_info & PGC_page_table) )
     {
         SHADOW_ERROR("can't find all shadows of mfn %05lx "
                      "(shadow_flags=%08lx)\n",
                       mfn_x(gmfn), pg->shadow_flags);
-        if ( all ) 
-            domain_crash(v->domain);
+        domain_crash(v->domain);
     }
 
     /* Need to flush TLBs now, so that linear maps are safe next time we